Added an optional argument to wait to the amount of time wait can vary between between the 2 specific values. 2nd 'vary' argument is ignored if value is less than 1st 'time' argument. This more closely resembles the wiki's description of wait as having a range value.

Removed redundant _resolve calls in task and renamed `vary` variable to max_time so it makes more sense.

moved resolver into task so that changes in incoming values are respected

Shortcircuit optional argument comparison to ignore if not specified to be more consistent with other optional arguments.

Forgot to check is max_time is int or None

Added testing of `wait` function.

Crude wait testing as we're rapidly reaching my limits in python vs the time I have for this.

# Conflicts:
#	inputremapper/injection/macros/macro.py